Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 22:11:22 +0000 (22:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 22:11:22 +0000 (22:11 +0000)
commit448a6259a83f8465d998f13bbaf79d9f71e4945e
tree5e16cda3dc1cdcbd2af3ae83e82060089906f1fb
parentda2e08f915f153193e881f4e09d66e56b6a5b50f
parentf5915b6aa99779476f1399db2f29fca4d3148fa6
Merge from mainline.